Final prep for 1.1.0 release.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index ad0814f03b51a85cadb03378d4e18540cdae9f72..0280b64acc5fe9b86f0c3d9b0532ea1d3d5e363a 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -31,14 +31,15 @@ dep:
        make clean && make CC="gcc -MMD"  && cat *.d */*.d > /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_1_0_pre120602
-VERSIOND=1.1.0_pre120602
+VERSIONU=1_1_0
+VERSIOND=1.1.0
 release:
        rm -fr gpsbabel-$(VERSIOND)
+       cvs tag gpsbabel_$(VERSIONU)
        cvs export -r gpsbabel_$(VERSIONU) -d gpsbabel-$(VERSIOND) gpsbabel
        tar cvzf /tmp/gpsbabel-$(VERSIOND).tar.gz gpsbabel-$(VERSIOND)
        cd /tmp ; tar xvzf gpsbabel-$(VERSIOND).tar.gz
-       cd /tmp/gpsbabel-$(VERSIOND)/mingw ; make  && zip gpsbabel-$(VERSIOND).zip  gpsbabel.exe libexpat.dll && cp gpsbabel-$(VERSIOND).zip /tmp
+       cd /tmp/gpsbabel-$(VERSIOND)/mingw ; make  && zip -j gpsbabel-$(VERSIOND).zip  gpsbabel.exe libexpat.dll ../win32/gpsbabelfront.exe && cp gpsbabel-$(VERSIOND).zip /tmp
        ncftpput -u anonymous upload.sf.net  /incoming /tmp/gpsbabel-$(VERSIOND).tar.gz /tmp/gpsbabel-$(VERSIOND).zip
 
 cetus.o: cetus.c defs.h queue.h coldsync/palm.h coldsync/pdb.h

diff --git a/gpsbabel/mingw/Makefile b/gpsbabel/mingw/Makefile
index 459bc0caec25c5a11bdce97b3bb4429665da35af..7760f7383a94d354aeedb70ab5aad29699250879 100644 (file)
--- a/gpsbabel/mingw/Makefile
+++ b/gpsbabel/mingw/Makefile
@@ -9,5 +9,6 @@ CFLAGS=-Iinclude -I../coldsync -O
 gpsbabel.exe: $(OBJS)
        $(CC) -static $(CFLAGS) $(OBJS) lib/libexpat.a -o gpsbabel.exe 
        cp gpsbabel.exe /tmp
-       zip -j /tmp/gpsbabel.zip gpsbabel.exe ../win32/gpsbabelfront.exe
+       zip -j /tmp/gpsbabel.zip gpsbabel.exe libexpat.dll \
+               ../win32/gpsbabelfront.exe